From 94906d076a9e3a0e047cf26da47e4e32d9e4da21 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 22 Apr 2020 18:23:45 -0400
Subject: [PATCH] Drop gtk_widget_reset_style

There was a single call left that should not be necessary.
Also drop no longer used attached-window functionality.
---
 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkwidget.c                      | 52 ----------------------------
 gtk/gtkwidget.h                      |  2 --
 gtk/gtkwidgetprivate.h               | 11 ------
 gtk/gtkwindow.c                      |  6 +---
 5 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 7d3ba28659..5e372b3a28 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4103,7 +4103,6 @@ gtk_widget_set_css_classes
 
 <SUBSECTION>
 gtk_widget_get_style_context
-gtk_widget_reset_style
 gtk_widget_class_get_css_name
 gtk_widget_class_set_css_name
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 6b0b80a50d..74b8b46ee8 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6027,38 +6027,6 @@ gtk_widget_real_direction_changed (GtkWidget        *widget,
   gtk_widget_queue_resize (widget);
 }
 
-static void
-reset_style_recurse (GtkWidget *widget, gpointer user_data)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  gtk_css_node_invalidate (priv->cssnode, GTK_CSS_CHANGE_ANY);
-
-  gtk_widget_forall (widget, reset_style_recurse, user_data);
-}
-
-/**
- * gtk_widget_reset_style:
- * @widget: a #GtkWidget
- *
- * Updates the style context of @widget and all descendants
- * by updating its widget path. #GtkContainers may want
- * to use this on a child when reordering it in a way that a different
- * style might apply to it.
- */
-void
-gtk_widget_reset_style (GtkWidget *widget)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  reset_style_recurse (widget, NULL);
-
-  g_list_foreach (priv->attached_windows,
-                  (GFunc) reset_style_recurse, NULL);
-}
-
 #ifdef G_ENABLE_CONSISTENCY_CHECKS
 
 /* Verify invariants, see docs/widget_system.txt for notes on much of
@@ -9214,8 +9182,6 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable,
       for (l = style_data->classes; l; l = l->next)
         gtk_widget_add_css_class (GTK_WIDGET (buildable), (const char *)l->data);
 
-      gtk_widget_reset_style (GTK_WIDGET (buildable));
-
       g_slist_free_full (style_data->classes, g_free);
       g_slice_free (StyleParserData, style_data);
     }
@@ -10581,24 +10547,6 @@ _gtk_widget_get_sizegroups (GtkWidget    *widget)
   return NULL;
 }
 
-void
-_gtk_widget_add_attached_window (GtkWidget    *widget,
-                                 GtkWindow    *window)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  priv->attached_windows = g_list_prepend (priv->attached_windows, window);
-}
-
-void
-_gtk_widget_remove_attached_window (GtkWidget    *widget,
-                                    GtkWindow    *window)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-
-  priv->attached_windows = g_list_remove (priv->attached_windows, window);
-}
-
 /**
  * gtk_widget_class_set_css_name:
  * @widget_class: class to set the name on
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 021a96c604..c43049961b 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -680,8 +680,6 @@ void         gtk_widget_add_controller        (GtkWidget          *widget,
 GDK_AVAILABLE_IN_ALL
 void         gtk_widget_remove_controller     (GtkWidget          *widget,
                                                GtkEventController *controller);
-GDK_AVAILABLE_IN_ALL
-void       gtk_widget_reset_style       (GtkWidget      *widget);
 
 GDK_AVAILABLE_IN_ALL
 PangoContext *gtk_widget_create_pango_context (GtkWidget   *widget);
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index b0d851d272..ad7cece066 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -144,12 +144,6 @@ struct _GtkWidgetPrivate
    */
   GtkRoot *root;
 
-  /* The list of attached windows to this widget.
-   * We keep a list in order to call reset_style to all of them,
-   * recursively.
-   */
-  GList *attached_windows;
-
   /* The style for the widget. The style contains the
    * colors the widget should be drawn in for each state
    * along with graphics contexts used to draw with and
@@ -243,11 +237,6 @@ void         _gtk_widget_remove_sizegroup      (GtkWidget    *widget,
 						gpointer      group);
 GSList      *_gtk_widget_get_sizegroups        (GtkWidget    *widget);
 
-void         _gtk_widget_add_attached_window    (GtkWidget    *widget,
-                                                 GtkWindow    *window);
-void         _gtk_widget_remove_attached_window (GtkWidget    *widget,
-                                                 GtkWindow    *window);
-
 AtkObject *       _gtk_widget_peek_accessible              (GtkWidget *widget);
 
 void              _gtk_widget_set_has_default              (GtkWidget *widget,
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 89a6eefbba..9d87e68d35 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2550,11 +2550,7 @@ remove_attach_widget (GtkWindow *window)
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
   if (priv->attach_widget)
-    {
-      _gtk_widget_remove_attached_window (priv->attach_widget, window);
-
-      priv->attach_widget = NULL;
-    }
+    priv->attach_widget = NULL;
 }
 
 static void
-- 
2.30.2